Merge branch 'feature-endpoints' into develop