Pull changes from nextgen_globtree_module into nextgen.