merge r16056 to 8.09