Merge "Minor bug fix in ex-intra experiment" into nextgenv2