merge r17388 to 8.09