next CE version friendly.