#14438 Renamed users to principals in role_patch associations for consistency