Upstream version 3.42.0