merge r12964 to 8.09