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 for dev-v3.5.1
in 0 seconds, using 0 compute credits, and was queued for 51 seconds