Merge "[AWARE] Update capabilties"