Merge branch 'jc/push-default-explicit' into maint