Pull changes from nextgen_local into nextgen.