[T7491] Fixes.

Merged Joel Maglioni requested to merge T7491 into master

Merge request reports