Upstream version 3.38.0