Merge "Refactor ORDM TAPI topology conversion"