Merge pull request #11926 from blckmn/osd-build