Merge branch 'stf606-final' into 'master'

MEC012 v2.2.1 - OAS 3.1

See merge request !9
1 job for v2.2.1
in 0 seconds, using 0 compute credits, and was queued for 1 second