TIMOB-15580 modified