Merge "Handle comment truncation in CommentStore"