Merge "Better buffer-overrun prevention" into rvc-dev