Merge "Fix OOM when running testAddRemoveRace" into rvc-dev