Merge branch 'trigger-fixes' into 'master'

trigger fixes

See merge request cds/software/ndscope!72
3 jobs for master in 6 minutes and 5 seconds (queued for 1 second)
latest