Resolve RDSD-39

Merged Federico Pérez Diduch requested to merge RDSD-39 into 12.0-stage

Closes RDSD-39

Merge request reports