Merge FastClusterMakerTool with main config

Thomas Streblerrequested to merge
tstreble-main-patch-a1bf into main

Follow up to !58735 (merged)

Merge request reports