Merge "Fix race condition" into rvc-dev