Merge branch 'stf644' into 'master'

STF644 - Milestone B - Merge stf644 to Master branch

See merge request !13
1 job for auto_generated_oas
in 10 seconds, using 0 compute credits, and was queued for 1 second