Merge branch 'bc/tree-walk-oid'