Merge branch 'jm/maint-diff-words-with-sbe' into maint