We've tested this fix on our 3.9 test server and plan to use it when we upgrade to 3.9 so I'm in support officially backporting it to 3.9 (and 3.8).
We've tested this fix on our 3.9 test server and plan to use it when we upgrade to 3.9 so I'm in support officially backporting it to 3.9 (and 3.8).