Merge remote-tracking branch 'ms/firewall-block-green' into next