Merge branch 'DOS0069865' into 'master'

Dos0069865

See merge request !99
1 job for v2.6.8 in 7 minutes and 46 seconds
latest