Create v1.7 fixin some bugs