[RR-438] modification f1357

Merged Matias requested to merge RR-438 into 12.0

Closes RR-438

Merge request reports