The fix has been deployed to nightly 1.17.14 where we are running further tests before considering uplift to other versions. If you are experiencing the issue on nightly, it would be great if you could let us know if this version resolves the issue for you.