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

Stf606 draft to final

See merge request !12
1 job for stf606-final in 0 seconds (queued for 7 seconds)