Issue #4319 should be backported to V3. @normj Here you have an issue for doing the backporting of PR #4317