[TIMOB-17045]: Address comment.