merge r15139 to 8.09 (closes: #4718), bump release number