- Fixed modern forwarding support (#13098)