tried to add support for comments in paragraphs on top of Jim's improvements, not working yet (cherry picked from jrao)
succeeded in adding support for handling comments in paragraphs - (cherry picked from jrao)
Format source