Change ambiguous name to make VS stop crying
Sync change from master
Merge remote-tracking branch 'origin/master' into feature-UserPermissions