Upstream version 487