[TIDOC-1835] Update per changes from TIMOB-17640 PR