Matthijs/stork 24 services clean commits

Merge request reports