Merge branch 'fortify' into 'master'

Fortify changes

See merge request !80
8 jobs for master in 18 minutes and 21 seconds (queued for 1 second)