merge r14999 to 8.09 (closes: #4784)