2nd merge patch