Merge "Fix unnecssary traversal for starting windows" into rvc-dev