Upstream version 3.99.0.0