[TIMOB-15623] Addressed more comments