Merge "Work on issue #22303510: Additional permissions aren't properly..." into mnc-dev