Merge branch 'jk/push-client-deadlock-fix'