Merge branch 'admin-api-account-view-namespace' into 'develop'