merge from v1.1