Upstream version 4-10