Resolve RV-778

Merged Ariel Caruso requested to merge RV-778 into 12.0-stage

Closes RV-778

Merge request reports