Merge branch 'merge-v2.8.1-and-v3.3.1' into 'master'

Merge v2.8.1 and v3.3.1

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

00:00:09