Merge branch 'devel' into 'testing'

refactor

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