merge from 1.4.0