#1323 + #1324

Merged Gaëlle Braud requested to merge fix/ui into master

Merge request reports