Merge branch 'dev' into 'testing'

delete img

See merge request !6
1 job for testing in 14 seconds (queued for 3 seconds)