merge r17801