merge official 0.6.8 release