Merge branch 'stf606-draft' into 'stf606-final'

STF606 - Milestone B - Merge stf606-draft to stf606-final branch

See merge request !7
2 jobs for stf606-final
in 0 seconds, using 0 compute credits, and was queued for 14 seconds