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

Dev v3.5.1

See merge request !101
1 job for dev-v3.6.1
in 0 seconds, using 0 compute credits, and was queued for 56 seconds