Merge "Attempt at fixing race condition during boot." into rvc-dev