Draft: Rework cluster / hit branches.

This MR should fail. It is only there to test if the back linking from Redmine to this MR works again This is a test.