Add changes for 1.6.6