merge r13078-13079 to 8.09