Merge "Friend intent: Proper support for dataSet"