Merge "Update the javadoc around FGS" into sc-dev