Upstream version 40.2