Merge branch 'aptool_fortification' into 'master'

Aptool fortification

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