[TIMOB-14624] Last comment on PR