Merge pull request #1819 from Ansuel/ddns-performance