Be more specific about permissions being correct
Fix copy/paste error
Merge branch 'develop' into release/12.0