Upstream version 2002