Merge branch 'stf606-final' into 'master'

MEC014 v2.1.1 - OAS v3.1

See merge request !4
3 jobs for master in 0 seconds (queued for 11 seconds)