Resolve RV-871 "Fix"

Merged Ariel Caruso requested to merge RV-871-fix into 12.0-DEFINITIVE

Closes RV-871

Merge request reports