Merge branch 'admin-scope-support-code' into 'develop'