merge from 1.0