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