Merge branch 'jc/hide-cr-in-diff-from-less'