Merge branch 'endpoint-render-fix'