More changes related to 4.0.0 library release