SOS-1571

SOS-1571 Rest of the activity sets