Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maint