Merge "Remove duplicated variables in EXT_INTER" into nextgenv2