Merge the Statemachine

Merged Filippo Reimer requested to merge freimer into main

Merge request reports