Backport fix 1652 to 4.0.x #1742
Description
Feature Request
Would it be possible to backport this fix to a 4.0.x release?
It would be great to get this fix for 4.0.xc users.
We can't yet upgrade everyone to 4.1.x without significant testing because there are considerable changes.
PS: I started creating a PR but couldn't find a "4.0" branch to apply it to.