[TIMOB-14624] Addressed comments in PR