Merge branch 'th/diff'