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