This change is a dependency for Wendelin MR wendelin!100 (merged).
Tests are currently running.
This will create a new commit in order to revert the existing changes.
