Upstream version 2.8