Merge "close stream after use" into udc-dev