Upstream version 0.30.0