Merge branch 'DOS0063936' into 'master'

Dos0063936

See merge request !13
1 job for 3.1.0 in 1 minute and 14 seconds (queued for 1 second)