Here’s the patch we made to our systems for this issue.
And another topic where we’ve been discussing the same issue.