1.5.x merge