Merge "Update to track FGS API development" into sc-dev