Integrated TIMOB-13373 fix