Pulled in changes from CommentCore