Resolve RV-862

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

Closes RV-862

Merge request reports