Merge pull request #6162 from Airwide/aw-fix-osd-thr-output