Merge "Be super safe" into rvc-dev