Imported Upstream version 0.24~rc2