Merge branch 'jc/1.7.0-push-safety' into jch