Merge pull request #3156 from rpv-tomsk/dns