Merge branch 'gaudi-v36r2' into 'master'

Upgrade Gaudi version for dev4 to latest tag v36r2

See merge request !982
1 job for master in 57 seconds (queued for 34 seconds)