simplifying the permissions to be consistent with other modules
Merge remote-tracking branch 'upstream/master'