[TIMOB-12822] ADDRESSING REVIEW COMMENTS.