Resolve RV-587

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

Closes RV-587

Merge request reports