DNS and json checkpoint updating changes

This PR will have to be manually merged, or bits of it cherry-picked as needed.