Merge branch 'issue_511' into 'master'

It closes #511

Closes #511

See merge request !530
3 jobs for master in 11 minutes and 9 seconds (queued for 40 seconds)
Status Name Job ID Coverage
  Test
passed Lint #224181

00:01:33

passed Test #224182

00:02:59

 
  Build
passed Build #224183

00:06:37