[TIMOB-17456]: Addressed comments