MT#4637 add the patch merged upstream by Richard.