Merge remote-tracking branch 'ms/dns-forwarding' into next