Added another stability fix for DNS setting (OMS-444)