Merge branch 'jc/alternate-push'