Merge "Fix broken PK setting page" into main