Pull latest changes from upper stream 1.4.x branch