Merge branch 'issue_517' into 'master'

It fixes #517

Closes #517

See merge request !535
4 jobs for 2.6.3 in 13 minutes and 33 seconds (queued for 52 seconds)
latest
Status Job ID Name Coverage
  Test
passed Lint #234599

00:01:33

passed Test #234600

00:03:28

 
  Build
passed Build and publish #234601

00:06:30

 
  Deploy
passed Deploy #234602
manual

00:02:01