Merge r13235 to 8.09