[TIMOB-13419] Address Comments