merge r14712 to 8.09 (closes: #4592)