Merge "Add missing javadocs" into sc-dev