partial cherry-pick of 060f109ecbbf14ceb54348b3731a97963eb89288
partial cherry-pick of 060f109ecbbf14ceb54348b3731a97963eb89288

hendricius/closure_tree,seuros/closure_tree,pgericson/closure_tree,froderik/closure_tree,fabien-michel/closure_tree,pgericson/closure_tree,seuros/closure_tree,hendricius/closure_tree,fabien-michel/closure_tree,procore/closure_tree,mceachen/closure_tree,froderik/closure_tree,seuros/closure_tree,pgericson/closure_tree,fabien-michel/closure_tree,procore/closure_tree,procore/closure_tree,mceachen/closure_tree,hendricius/closure_tree,mceachen/closure_tree,froderik/closure_tree