Merge "Fixed error that was repeatedly polluting the log" into rvc-dev