Picked _tree_ object from dogfood branch:

since previous commit dogfood was force-updated and
master HEAD commit untouched: 2ac4425