Merge branch 'devel' into 'testing'

Refactoring and codes cleaning

See merge request !144
1 job for testing in 20 seconds (queued for 3 seconds)