Merge branch 'improve-scenario' into 'master'

Improve scenario

See merge request !53
1 job for master in 2 minutes and 2 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed test #7448

00:02:02