Merge branch 'rs/http-push-cleanup'