[TIMOB-14990] Manual backport to 1_0_X