Added permission check
Merge branch 'hotfix/v1.4.8'