Merge branch 'jc/maint-log-merge-left-right' into maint