Merge pull request #17901 from demeritcowboy/outputhandler2