Merge "[AWARE] Update API per review"