more permission checks
Merge branch 'release/4.1.59'