Merge branch 'stf606-final' into 'master'

MEC010-2 v2.2.1 - OAS v3.1

See merge request !9
13 jobs for master in 0 seconds (queued for 8 seconds)