merge r98884