Changes per PR comments. TIMOB-11811