merge r15028 to 8.09 (close: #4777)