Merge "Fix testRestart" into rvc-dev