Merge "Fix a bug and a function name in EXT_INTRA experiment" into nextgenv2