Merge branch 'jk/diff-CBM'