TIMOB-16353-addressed review comments