Merge branch 'isoc' into 'master'

Fix non-std syntax

See merge request !555
3 jobs for !555 with isoc into master in 40 minutes and 16 seconds (queued for 1 second)