Merge branch 'develop-WinbuilderFixs' into 'master'

Fixes required from Win-builder

See merge request !16
1 job for master
in 7 minutes and 17 seconds, using 0 compute credits, and was queued for 0 seconds