Pulled in enhancements from CommentCoreLibrary
Merge