Merge branch 'master' into 'bsc_operationals'

updated from Master

See merge request !32
3 jobs for bsc_operationals
in 1 minute and 38 seconds, using 0 compute credits, and was queued for 0 seconds