Merge branch 'jk/two-way-merge-corner-case-fix' into maint