https://build.spring.io/browse/INT-MJATS41 **Cherry-pick to 4.3.x** (cherry picked from commit 168d91c)
168d91c