Merge "Replace stream wrap-function w/ more specific ones" into klp-dev