Merge "Speed-up for ext-intra" into nextgenv2