Merge "Using for loop instead of stream" into rvc-dev