https://build.spring.io/browse/INT-MASTER-1313/ **Cherry-pick to 5.0.x** (cherry picked from commit 89fdb938de)
89fdb938de