merge r15058 to 8.09 (closes: #4839), bump release number