Merge "Refactor TAPI ConvertORTopoToTapiFullTopo"