Resolve RV-790

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

Closes RV-790

Merge request reports