merge r14055 to 8.09