Resolve RC-327

Merged Federico Pérez Diduch requested to merge RC-327 into 12.0-stage

Closes RC-327

Merge request reports