merge r15944 to 8.09