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

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

See merge request !4