Upstream version 338