Merge branch 'pm/diff'