Merge branch 'its9925' into 'master'

ITS#9925 Fix some ancient #ifdef checks

See merge request !573
3 jobs for !573 with its9925 into master in 33 minutes and 47 seconds (queued for 1 second)
latest