Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'