timob-15535: Revert timob-14615
Merge pull request #5208 from hieupham007/timob-15535-3_2_X

timob-15535: Revert timob-14615