changes for 2.6.5