Upstream version 08-248