Merge branch 'issue_518' into 'master'

It fixes #518

Closes #518

See merge request !536
4 jobs for 2.6.4 in 14 minutes and 29 seconds (queued for 1 minute and 36 seconds)
latest
Status Name Job ID Coverage
  Test
passed Lint #235288

00:01:30

passed Test #235289

00:04:51

 
  Build
passed Build and publish #235290

00:06:34

 
  Deploy
passed Deploy #235291
manual

00:01:44