merge -r15319 to 8.09 (#5005)