Merge branch 'fabreges-master-patch-99336' into 'master'

Fix title

See merge request !1057
2 jobs for master in 38 seconds (queued for 3 seconds)