Merge branch 'dev_ema' into 'master'

Ema group contributions to the basic-simulator

See merge request !6
1 job for master in 19 seconds
Status Name Job ID Coverage
  Maven
canceled linux_maven_master #1539622

00:00:19