Resolve RV-596

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

Closes RV-596

Merge request reports