The patch looks good to me. But I think it does not worth a separate upload for only this bug. So let's wait for more patches coming, especially I'm looking forward to seeing someone cooks out a fix for #638165. -- Regards, Aron Xu