Merge branch 'jk/push-deadlock-regression-fix' into maint