Merge "refactor ext-intra" into nextgenv2