Merge branch 'revert-f7d869f5' into 'develop'

Revert "Merge branch 'allevidence' into 'develop'"

See merge request !9
1 job for develop in 2 seconds (queued for 5 seconds)