Revert "Merge branch 'feature/6' into 'master'"

This reverts merge request !3
6 jobs for revert-1df057c4 in 1 minute and 25 seconds (queued for 2 seconds)
latest