Merged CommentCoreLibrary enhancements