Adding changes for 2.5.0