Pre 2.5.0 release commit