Hi, I've created a pull request #1701 to fix the issue in 2.4 branch. Made a quick 3.0 branch review and it looks like the problem is still there. Could you take a look at this PR. Would be nice to fix it at least in 3.0 since stable release is coming soon.