Imported 3.6.6 release