Backported 15e4e27c46542266b9776531b2f8f6ad8749ea0f to fix issues with User Roles eagerly loading