Merge branch 'ah/fix-http-push' into maint