Merge branch 'paolo/fix-461' into 'master'

Add testcase for #461

See merge request !798
3 jobs for master in 13 minutes and 19 seconds (queued for 3 seconds)