changes for 2.6.0.4