Merge "diag: Add separation of cmd/rsp"