Imported Upstream version 0.30.2