Merge "Update Javadoc method references" into sc-dev