Merging FindDueActivityForFriend with master