Closing as the patch got applied in commit
d6817e0086d0cdf0f19e1c9f228e07cc01096775.