Resolve RV-861

Closed Uriel Mayo requested to merge RV-861-fix into 12.0-stage

Closes RV-861

Merge request reports