Merge branch 'dev' into 'master'

Dev

See merge request !5
2 jobs for master in 1 minute and 48 seconds
Status Name Job ID Coverage
  Windows
passed masterJobWindows #358050
Windows10

00:00:22

 
  Linux
passed masterJobLinux #358051

00:01:25