Ready for 1.0-DEV25