Merge "More social integration." into ics-mr1