Resolve RV-867

Merged Uriel Mayo requested to merge RV-867 into 12.0-stage

Closes RV-867

Merge request reports