[TIMOB-17805][TIMOB-17806] Migrate 3.4.1->3.4.2