Merge "change to not force interp_type as SWITCHABLE"