https://build.spring.io/browse/INT-MASTER-978/ **Cherry-pick to 5.0.x** (cherry picked from commit 4f616e9)
4f616e9