Merge branch 'pb/diffroot'