Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'