Upstream version 334