[TIMOB-2710] Addressed more comments