Merge branch 'issue_469' into 'master'

Issue 469

See merge request !479
3 jobs for master in 10 minutes and 23 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #160136
Lint

00:01:30

passed #160137
Test

00:03:39

 
  Build
passed #160138
Build

00:05:14