Upstream version 008