Merge branch 'jc/apply-fix-mismerge'