Merge "Refactor TAPI utils TapiContext"