Merge branch 'jc/push-2.0-default-to-simple' (early part)