Merge "Make the use of pred buffers consistent in MB/SB" into experimental