Merge "Refactor setting up MVs and buffers in rdopt.c" into experimental