Merge branch 'stf606-final' into 'master'

MEC030 v2.2.1 - OAS v.3.1

See merge request !6
1 job for master in 0 seconds (queued for 11 seconds)