Merge "Fix DNS setting bug"