https://build.spring.io/browse/INT-MASTERSPRING40-663/
https://build.spring.io/browse/INT-FATS5IC-832/
**Cherry-pick to 5.1.x & 5.0.x**
(cherry picked from commit 3fc278688c)
https://build.spring.io/browse/INT-MASTERSPRING40-663/
https://build.spring.io/browse/INT-FATS5IC-832/
**Cherry-pick to 5.1.x & 5.0.x**
(cherry picked from commit 3fc278688c)