Merge pull request #11932 from blckmn/init_osd