fixes #7336 permission updates for v1.5.0
Merge branch 'dev' into test