fixes TIMOB-13065, PR updated for 3.2.0
Merge pull request #4850 from mokesmokes/TIMOB-13065-NEW

fixes TIMOB-13065, PR updated for 3.2.0