merge r46023