commit: Merge some permissions corrections to trunk.