Merge "Uninitialized member fix :(" into rvc-dev