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

Stf606 draft to final

See merge request !5
1 job for stf606-final
in 0 seconds, using 0 compute credits, and was queued for 7 seconds