Any traction on fixing this issue?

There are patches attached to both merged issues.