finish merge from 1.4