Upstream 3.41.1