Merge branch 'stf606-final' into 'master'

MEC013 v2.2.1 - OAS v3.1

See merge request !8
3 jobs for master in 0 seconds (queued for 7 seconds)