TIMOB-16207 modified