JIRA: https://jira.spring.io/browse/INT-4552 **Cherry-pick to 5.0.x** (cherry picked from commit ce3ac36dcd)
ce3ac36dcd