Merge branch 'api-auth-endpoint' into develop