Merge branch 'fix-ut-azure' into 'master'

Azure UT fix

See merge request !188
29 jobs for master in 126 minutes and 22 seconds (queued for 4 seconds)