Fixing issue THRONE-83
Fixing issue THRONE-41
Merge branch 'gitlab/f.guitton'