am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t...
am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev
* commit 'b7394671':
Work on issue #22303510: Additional permissions aren't properly...