Merge branch 'revert-add0c805' into 'master'

Revert "Merge branch 'feature/azure-file-handing' into 'master'"

See merge request !14
4 jobs for master in 2 minutes and 26 seconds (queued for 1 second)