Upstream version 41.0