Upstream version 670