Merge branch 'rc/http-push'