[FIX] [RV-180] some small changes

Merged Arturo Porthe requested to merge RV180 into 12.0-stage

Merge request reports