Upstream version 010