Merge branch 'es/local-atomic-push-failure-with-http' into maint