[SD-1272] modified notification and activity stream modules.