Merge branch 'DOS0205579' into 'master'

Dos0205579

See merge request !170
1 job for v2.8.1 in 9 minutes and 49 seconds (queued for 2 seconds)
latest