update changes for 2.6.x