Merge branch 'Azure-VDS-Pipeline-Fixes' into 'master'

Azure Pipeline Fixes for VDS

See merge request !37
1 job for !40 with master in 8 minutes and 9 seconds
latest merge request