[TIDOC-1788] Update due to changes from TIMOB-17440