Merge "Fix iterator usage" into rvc-dev