merge r14293 to 8.09