Merge "Take out some early termination speed features" into nextgenv2