Merge branch 'jt/push-negotiation-fixes' into maint