7.x 1.x merge labels fix