Merge "Renamings for OBMC experiment" into nextgenv2