Upstream version 4-9