Merge branch 'issue_510' into 'master'

It closes #510

Closes #510

See merge request !529
4 jobs for 2.6.1 in 13 minutes and 30 seconds (queued for 1 minute and 2 seconds)
latest
Status Name Job ID Coverage
  Test
passed Lint #221718

00:01:35

passed Test #221719

00:03:24

 
  Build
passed Build and publish #221720

00:06:42

 
  Deploy
passed Deploy #221721
manual

00:01:48