For release 1.0.x