Merge "add new functionality to aai client"