TIMOB-13723-Incorporate review comments