merge from v1.0