Merge "Fixed the dns records grain"