Merge pull request #11885 from blckmn/unified