Merge "Close file streams" into rvc-dev