Merge r15809 to 8.09