Merge branch 'fix-parameter-loading' into 'master'

Fix parameter loading

See merge request !12
2 jobs for master in 6 minutes and 25 seconds
Status Name Job ID Coverage
  Windows
passed masterJobWindows #298759
Windows10

00:03:43

 
  Linux
passed masterJobLinux #298760

00:02:42