Merge branch 'jc/trivial-threeway-binary-merge' into maint