Merge branch 'dev-v3.5.1' into 'master'

Dev v3.5.1

See merge request !101
1 job from master in 0 seconds (queued for 10 seconds)
latest
Status Job ID Name Coverage
  External
passed jenkins

00:00:12