Merge branch 'issue_506' into 'master'

Issue 506

Closes #506

See merge request !526
4 jobs for 2.6 in 13 minutes and 23 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Test
passed Lint #221600

00:01:33

passed Test #221601

00:03:24

 
  Build
passed Build and publish #221602

00:06:35

 
  Deploy
passed Deploy #221603
manual

00:01:50