Merge branch '3.5.1-dev' into 'master'

merge 3.5.1 dev into master

See merge request !3
3 jobs for v3.5.1
in 18 seconds, using 0 compute credits, and was queued for 0 seconds
latest