Merge branch 'apps-api-endpoint' into 'develop'