Upstream version 337