Resolve RV-752

Merged Uriel Mayo requested to merge RV-752 into 12.0-stage

Closes RV-752

Merge request reports