Compatbility with master - allowed_actions private
Merge branch 'master' into permission-tests