merge r14497, r14498 to 8.09