Migrate to 0.4.0.RC2