Up to 6.0.0 RC2