Merge "Drop the UserRights hook, deprecated in 1.26"