Merge "Fix bouncer race condition" into rvc-dev