Merge "Fix bugs in SUB8X8_MC" into nextgenv2