1.1.x merge