Merge "Fix interpolation values and decouple interintra" into nextgenv2