Upstream version 06-053