Merge pull request #13636 from neheb/pdnsr2