Upstream version 06-010