Merge branch 'devel' into 'testing'

Refactor

See merge request !89
1 job for testing in 18 seconds (queued for 1 second)