Merge pull request #16628 from mwarning/uradvd