Upstream version 3.0-3