Merge branch 'sim_dev' into 'master'

Sim dev

See merge request !10
1 job for master in 1 minute and 58 seconds (queued for 6 seconds)
Status Name Job ID Coverage
  Maven
passed linux_maven_master #2034715

00:01:58