Merge branch 'master' into develop
Case 3766 - Fixed permission check.
Merge branch 'case-3766' into develop

* case-3766:
  Case 3766 - Fixed permission check.
Merge branch 'develop'