Merge branch 'deprecate-public_endpoint' into 'develop'