Merge branch 'docs/admin-api' into 'develop'