Upstream version 3.0