Merge branch 'mk/diff'