Upstream version 6.0.40