Merge branch 'issue_514' into 'master'

It fixes #514

Closes #514

See merge request !533
4 jobs for 2.6.2 in 5 minutes and 6 seconds (queued for 4 seconds)
latest
Status Name Job ID Coverage
  Test
passed Lint #225108

00:01:22

passed Test #225109

00:02:56

 
  Build
passed Build and publish #225110

00:00:22

 
  Deploy
passed Deploy #225111
manual

00:01:47