Step towards moving all different access tabs to a single master permissions tab
Merge remote-tracking branch 'upstream/pr/11769' into pr/11769

* upstream/pr/11769:
  Step towards moving all different access tabs to a single master permissions tab