fixes TIMOB-13065, PR updated for 3.2.0