Merge "Clean up ext-interp experiment" into nextgenv2