Resolve RV-676

Merged Ariel Caruso requested to merge RV-676 into 12.0-stage

Closes RV-676

Merge request reports