Merge branch 'uniform-admin-api-url' into 'develop'