Merge attempt 2.
Changes to the activity stream comments section