https://build.spring.io/browse/INT-FATS5IC-843/
**Cherry-pick to 5.1.x & .5.0.x**
(cherry picked from commit e3e11a6999)
https://build.spring.io/browse/INT-FATS5IC-843/
**Cherry-pick to 5.1.x & .5.0.x**
(cherry picked from commit e3e11a6999)