Merge branch 'ttf-034' into 'dev'

Ttf 034

See merge request !2
5 jobs for dev
in 6 minutes and 32 seconds, using 0.0 compute credits, and was queued for 2 seconds