Merge "Extend number of reference buffers to 8." into experimental