Merge branch 'sb/atomic-push'