[TIMOB-13491] Manual backport to 1_0_X