Merge branch 'develop' into 'master'

Added several parameters

See merge request !26
3 jobs for master
Status Job ID Name Coverage
  Windows
passed #623007
Windows10_OS
masterJobWindows

00:06:48

failed #615413
Windows10_OS
masterJobWindows

 
  Linux
passed #615414
masterJobLinux

00:04:47