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

* commit '863504111546fb46fcb5af356efb267c8582018a':
  Work on issue #22303510: Additional permissions aren't properly...