merge patch of R_2.2.60.50