[REVIEW][TASK 8990] review TOS integration Pre requisite 1
[REVIEW][TASK 8990] review TOS integration Pre requisite 1