Merge "Revert "Limit the numer of output and inout streams open""