Resolve RV-718

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

Closes RV-718

Merge request reports