TIMOB-12504 Last set of changes for now. Ready for CR.