Merge "[Epic-ID: ODUHIGH-475][Task-ID: ODUHIGH-476] O1 integration fixes"