TIMOB-12539 updated