Complement fix for THRONE-82
Merge branch 'gitlab/f.guitton'