Imported Upstream version 0.20.0~rc.3