merge r12869-12871 to 8.09