Hi Richard,
Thanks for looking. Agreed, the cause is old and the fix does nottouch anything 0da29e4cb16 added. I will move the entry to "Olderbugs affecting stable branches".
Thanks,Shihao