Merge branch 'issue_509' into 'master'

This fixes #509

Closes #509

See merge request !528
4 jobs for 2.5.1 in 13 minutes and 22 seconds (queued for 1 minute and 8 seconds)
latest
Status Name Job ID Coverage
  Test
passed Lint #220859

00:01:34

passed Test #220860

00:03:26

 
  Build
passed Build and publish #220861

00:06:31

 
  Deploy
passed Deploy #220862
manual

00:01:50