Merge branch 'RV-789' into '12.0-stage'

Merged Facundo Benítez requested to merge 12.0-stage-dot91 into 12.0

Resolve RV-789

Closes RV-789

See merge request !140 (merged)

Merge request reports