Merge "Refactor TAPI utils TapiLinkImpl"