Merge "Yet more bad-state hardening" into rvc-dev