Merge branch 'dev' into 'testing'

Joël Cuissinatrequested to merge
testing into dev

Prepare testing

See merge request !1 (merged)

Merge request reports