TIMOB-4469 made common