Resolve RV-731 "Fix"

Merged Ariel Caruso requested to merge RV-731-FIX into 12.0-prod-merge

Closes RV-731

Merge request reports