Merge branch 'devel-fix' into 'testing'

Devel fix

See merge request !7
1 job for testing in 7 seconds (queued for 2 seconds)