Merge "Note API alternatives in javadoc" into sc-v2-dev