Merge "Add of adapter fun with param ClientContext"