Merge branch '3817_mcview_grow_buffer'