[TIMOB-10380] Manual merge of 3_0_X