Merge latest DNS codebase