Merge branch 'lt/diff' into next