[SD-1272] Modified code for activity stream.