Merge branch 'issue_489' into 'master'

Issue 489

Closes #489

See merge request !500
4 jobs for 2.4.2.3 in 11 minutes and 31 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Test
passed Lint #204461

00:01:33

passed Test #204462

00:02:48

 
  Build
passed Build and publish #204463

00:05:58

 
  Deploy
passed Deploy #204464
manual

00:01:55