Merge pull request #11710 from neheb/pdnsddd