add changes for 2.6.6