Merge branch 'stf644' into 'master'

STF644 - Milestone B - Merge stf644 to Master branch

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