TIMOB-7739 modified