Add dnsexit support from #1798