MT#3983 WIP, reworking stream handlers