Resolve RV-807

Merged Uriel Mayo requested to merge RV-807 into 12.0-prod-merge

Closes RV-807

Merge request reports