Merge pull request #13142 from mateste/moniker.com_ddns