Merge "Fix for ext_interp experiment" into nextgenv2