merge r17576 to 8.09