Merge "Fix paragraphs in blur javadocs" into sc-dev