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)