Cherry pick test, and start merging in LP changes from nameless 2.0