Merge "Revert "Avoid creating new instance on top when started for resu..."" into rvc-dev