Merge "Fix unused warning without ext-interp" into nextgenv2