Merge "Revert "Deprecate the DATA_SYNC FGS type."" into main