manual merge from 1.4: