TIMOB-13427 modified