sync to 0.6.6

sync to 0.6.6