merge r13821 to 8.09 (closes: #4582)