merge r17552 to 8.09