Merge branch 'cm/diff-check-at-eol'