Merge branch 'stf644' into 'master'

STF644 - Milestone B - Merge stf644 to Master branch

See merge request !11
1 job for master
in 6 seconds, using 0 compute credits, and was queued for 3 minutes and 57 seconds