Changes to Core for the new CommentBundle