Merge branch 'OptionsFix' into 'master'

Options fix

See merge request !5
1 job for master in 3 minutes and 30 seconds (queued for 1 second)
Status Name Job ID Coverage
  Linux
passed TestJobLinux #1187489

00:03:30