merge r17387 to 8.09