Merge branch 'jk/more-push-completion'