Merge "Allow multiple Forwarders through DynamicSet<>" into stable-2.16