Merge branch 'master' into New-Feature-X
Updated permissions and documentation
Merge branch 'New-Feature-X'