Merge "Refactor TAPI ConvertORToTapiTopology"