diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index e710efb52b..d16d65b51d 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(FDBSERVER_SRCS
-  ApplyMetadataMutation.h
   ApplyMetadataMutation.cpp
+  ApplyMetadataMutation.h
   BackupInterface.h
   BackupProgress.actor.cpp
   BackupProgress.actor.h
@@ -8,10 +8,11 @@ set(FDBSERVER_SRCS
   BlobManager.actor.cpp
   BlobManagerInterface.h
   BlobWorker.actor.cpp
-  ClusterController.actor.h
   ClusterController.actor.cpp
-  ClusterRecovery.actor.h
+  ClusterController.actor.h
   ClusterRecovery.actor.cpp
+  ClusterRecovery.actor.h
+  CommitProxyServer.actor.cpp
   ConfigBroadcaster.actor.cpp
   ConfigBroadcaster.h
   ConfigDatabaseUnitTests.actor.cpp
@@ -34,11 +35,11 @@ set(FDBSERVER_SRCS
   DDTeamCollection.actor.cpp
   DDTeamCollection.h
   DiskQueue.actor.cpp
-  EncryptKeyProxyInterface.h
   EncryptKeyProxy.actor.cpp
-  fdbserver.actor.cpp
+  EncryptKeyProxyInterface.h
   FDBExecHelper.actor.cpp
   FDBExecHelper.actor.h
+  fdbserver.actor.cpp
   GrvProxyServer.actor.cpp
   IConfigConsumer.cpp
   IConfigConsumer.h
@@ -69,14 +70,13 @@ set(FDBSERVER_SRCS
   LogSystemDiskQueueAdapter.h
   LogSystemPeekCursor.actor.cpp
   MasterInterface.h
+  masterserver.actor.cpp
   MetricLogger.actor.cpp
   MetricLogger.actor.h
-  CommitProxyServer.actor.cpp
-  masterserver.actor.cpp
-  MutationTracking.h
-  MutationTracking.cpp
-  MoveKeys.actor.h
   MoveKeys.actor.cpp
+  MoveKeys.actor.h
+  MutationTracking.cpp
+  MutationTracking.h
   networktest.actor.cpp
   NetworkTest.h
   OldTLogServer_4_6.actor.cpp
@@ -92,35 +92,39 @@ set(FDBSERVER_SRCS
   QuietDatabase.actor.cpp
   QuietDatabase.h
   RadixTree.h
-  Ratekeeper.h
   Ratekeeper.actor.cpp
+  Ratekeeper.h
   RatekeeperInterface.h
   RecoveryState.h
-  RestoreCommon.actor.h
-  RestoreCommon.actor.cpp
-  RestoreUtil.h
-  RestoreUtil.actor.cpp
-  RestoreRoleCommon.actor.h
-  RestoreRoleCommon.actor.cpp
-  RestoreController.actor.h
-  RestoreController.actor.cpp
-  RestoreApplier.actor.h
-  RestoreApplier.actor.cpp
-  RestoreLoader.actor.h
-  RestoreLoader.actor.cpp
-  RestoreWorker.actor.h
-  RestoreWorker.actor.cpp
-  RestoreWorkerInterface.actor.cpp
-  RestoreWorkerInterface.actor.h
   Resolver.actor.cpp
   ResolverInterface.h
-  RoleLineage.actor.h
+  RestoreApplier.actor.cpp
+  RestoreApplier.actor.h
+  RestoreCommon.actor.cpp
+  RestoreCommon.actor.h
+  RestoreController.actor.cpp
+  RestoreController.actor.h
+  RestoreLoader.actor.cpp
+  RestoreLoader.actor.h
+  RestoreRoleCommon.actor.cpp
+  RestoreRoleCommon.actor.h
+  RestoreUtil.actor.cpp
+  RestoreUtil.h
+  RestoreWorker.actor.cpp
+  RestoreWorker.actor.h
+  RestoreWorkerInterface.actor.cpp
+  RestoreWorkerInterface.actor.h
+  RocksDBCheckpointUtils.actor.cpp
+  RocksDBCheckpointUtils.actor.h
   RoleLineage.actor.cpp
+  RoleLineage.actor.h
+  ServerCheckpoint.actor.cpp
+  ServerCheckpoint.actor.h
   ServerDBInfo.actor.h
   ServerDBInfo.h
   SigStack.cpp
-  SimEncryptVaultProxy.actor.h
   SimEncryptVaultProxy.actor.cpp
+  SimEncryptVaultProxy.actor.h
   SimpleConfigConsumer.actor.cpp
   SimpleConfigConsumer.h
   SimulatedCluster.actor.cpp
@@ -137,18 +141,18 @@ set(FDBSERVER_SRCS
   TagPartitionedLogSystem.actor.h
   TagThrottler.actor.cpp
   TagThrottler.h
-  template_fdb.h
   TCInfo.actor.cpp
   TCInfo.h
+  template_fdb.h
   tester.actor.cpp
   TesterInterface.actor.h
   TLogInterface.h
   TLogServer.actor.cpp
-  TSSMappingUtil.actor.h
   TSSMappingUtil.actor.cpp
+  TSSMappingUtil.actor.h
   VersionedBTree.actor.cpp
-  VFSAsync.h
   VFSAsync.cpp
+  VFSAsync.h
   WaitFailure.actor.cpp
   WaitFailure.h
   worker.actor.cpp
@@ -166,37 +170,35 @@ set(FDBSERVER_SRCS
   workloads/AtomicRestore.actor.cpp
   workloads/AtomicSwitchover.actor.cpp
   workloads/BackgroundSelectors.actor.cpp
-  workloads/BackupCorrectness.actor.cpp
   workloads/BackupAndParallelRestoreCorrectness.actor.cpp
-  workloads/ClogSingleConnection.actor.cpp
-  workloads/ConfigIncrement.actor.cpp
+  workloads/BackupCorrectness.actor.cpp
   workloads/BackupToBlob.actor.cpp
   workloads/BackupToDBAbort.actor.cpp
   workloads/BackupToDBCorrectness.actor.cpp
   workloads/BackupToDBUpgrade.actor.cpp
-  workloads/BlobStoreWorkload.h
   workloads/BlobGranuleVerifier.actor.cpp
+  workloads/BlobStoreWorkload.h
   workloads/BulkLoad.actor.cpp
   workloads/BulkSetup.actor.h
   workloads/Cache.actor.cpp
   workloads/ChangeConfig.actor.cpp
+  workloads/ChangeFeeds.actor.cpp
   workloads/ClearSingleRange.actor.cpp
   workloads/ClientTransactionProfileCorrectness.actor.cpp
-  workloads/TriggerRecovery.actor.cpp
-  workloads/SuspendProcesses.actor.cpp
+  workloads/ClogSingleConnection.actor.cpp
   workloads/CommitBugCheck.actor.cpp
+  workloads/ConfigIncrement.actor.cpp
   workloads/ConfigureDatabase.actor.cpp
   workloads/ConflictRange.actor.cpp
   workloads/ConsistencyCheck.actor.cpp
   workloads/CpuProfiler.actor.cpp
   workloads/Cycle.actor.cpp
-  workloads/ChangeFeeds.actor.cpp
   workloads/DataDistributionMetrics.actor.cpp
   workloads/DataLossRecovery.actor.cpp
-  workloads/PhysicalShardMove.actor.cpp
   workloads/DDBalance.actor.cpp
   workloads/DDMetrics.actor.cpp
   workloads/DDMetricsExclude.actor.cpp
+  workloads/DifferentClustersSameRV.actor.cpp
   workloads/DiskDurability.actor.cpp
   workloads/DiskDurabilityTest.actor.cpp
   workloads/DiskFailureInjection.actor.cpp
@@ -207,18 +209,19 @@ set(FDBSERVER_SRCS
   workloads/FileSystem.actor.cpp
   workloads/Fuzz.cpp
   workloads/FuzzApiCorrectness.actor.cpp
+  workloads/GetMappedRange.actor.cpp
   workloads/GetRangeStream.actor.cpp
   workloads/HealthMetricsApi.actor.cpp
   workloads/HighContentionPrefixAllocatorWorkload.actor.cpp
-  workloads/IncrementalBackup.actor.cpp
   workloads/Increment.actor.cpp
+  workloads/IncrementalBackup.actor.cpp
   workloads/IndexScan.actor.cpp
   workloads/Inventory.actor.cpp
-  workloads/KVStoreTest.actor.cpp
   workloads/KillRegion.actor.cpp
+  workloads/KVStoreTest.actor.cpp
+  workloads/LocalRatekeeper.actor.cpp
   workloads/LockDatabase.actor.cpp
   workloads/LockDatabaseFrequently.actor.cpp
-  workloads/LocalRatekeeper.actor.cpp
   workloads/LogMetrics.actor.cpp
   workloads/LowLatency.actor.cpp
   workloads/MachineAttrition.actor.cpp
@@ -229,9 +232,9 @@ set(FDBSERVER_SRCS
   workloads/MetricLogging.actor.cpp
   workloads/MiniCycle.actor.cpp
   workloads/MutationLogReaderCorrectness.actor.cpp
-  workloads/GetMappedRange.actor.cpp
   workloads/ParallelRestore.actor.cpp
   workloads/Performance.actor.cpp
+  workloads/PhysicalShardMove.actor.cpp
   workloads/Ping.actor.cpp
   workloads/PopulateTPCC.actor.cpp
   workloads/ProtocolVersion.actor.cpp
@@ -260,11 +263,12 @@ set(FDBSERVER_SRCS
   workloads/SlowTaskWorkload.actor.cpp
   workloads/SnapTest.actor.cpp
   workloads/SpecialKeySpaceCorrectness.actor.cpp
-  workloads/StreamingRangeRead.actor.cpp
   workloads/StatusWorkload.actor.cpp
   workloads/Storefront.actor.cpp
+  workloads/StreamingRangeRead.actor.cpp
   workloads/StreamingRead.actor.cpp
   workloads/SubmitBackup.actor.cpp
+  workloads/SuspendProcesses.actor.cpp
   workloads/TagThrottleApi.actor.cpp
   workloads/TargetedKill.actor.cpp
   workloads/TaskBucketCorrectness.actor.cpp
@@ -275,11 +279,11 @@ set(FDBSERVER_SRCS
   workloads/TimeKeeperCorrectness.actor.cpp
   workloads/TPCC.actor.cpp
   workloads/TPCCWorkload.h
-  workloads/DifferentClustersSameRV.actor.cpp
+  workloads/TriggerRecovery.actor.cpp
+  workloads/UDPWorkload.actor.cpp
   workloads/UnitPerf.actor.cpp
   workloads/UnitTests.actor.cpp
   workloads/Unreadable.actor.cpp
-  workloads/UDPWorkload.actor.cpp
   workloads/VersionStamp.actor.cpp
   workloads/WatchAndWait.actor.cpp
   workloads/Watches.actor.cpp