Resolve RV-716

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

Closes RV-716

Merge request reports