Merge branch 'js/maint-http-push' into maint