https://build.spring.io/browse/INT-AT42SIO-498/
**Cherry-pick to 4.3.x and 4.2.x**
(cherry picked from commit 9de2856)
https://build.spring.io/browse/INT-AT42SIO-498/
**Cherry-pick to 4.3.x and 4.2.x**
(cherry picked from commit 9de2856)