Upstream version 278