Imported Upstream version 0.25.0