Merge "Add clarifications to CDM javadoc" into sc-dev