Merge branch 'DOS0089064' into 'master'

DOS0089064

See merge request !112
1 job for v2.6.14 in 10 minutes and 5 seconds
latest