Upstream version 4-5