Merge branch 'lt/diffgen' into next