Merge "Fix obmc + ext-interp interference" into nextgenv2