Upstream version 3.99.2.2