Merge branch 'bc/http-push-flagsfix'