Merge "Support bulk capability exchange in UCE"