Merge "[AWARE] Data-path negotiation update"