I wanted to follow up on this and see if this fix was merged. If not, can you link the PR here so I can track it?