merge r17683 to 2.6.30