Merge "Workaround for crash from invalid snapshot" into rvc-dev