Merge pull request #4389 from priyankakaran26/recurring-activity-46