Merge branch 'revert-6e27fc9c' into 'develop'

Revert "Merge branch 'log-slow-queries' into 'develop'"

See merge request !3619
19 jobs for develop in 70 minutes and 1 second (queued for 6 seconds)