Testing Dns fixes

For testing only, do not merge