Merge remote-tracking branch 'ferstl/dynu-ddns-fix' into next