Merge pull request #3318 from Ansuel/rework-ddns