Merge branch 'bc/smart-http-atomic-push'