Merge branch 'jk/complete-merge-pull' into maint