Upstream version 06-234