Merge "Corrects Javadoc method reference" into sc-dev