Merge "Migrate fr-sync to use Uint types"