Merge "Deprecate the DATA_SYNC FGS type." into main