Resolve RDSD-26

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

Closes RDSD-26

Merge request reports