Merge branch 'kb/diff-C-M-synonym' into next