Merge branch 'stf606-final' into 'master'

Bug fixing

See merge request !11
1 job for v2.2.1 in 0 seconds
latest