Merge "Fix bug 837: realloc mode info buffers on resize"