Resolve PREM-66

Merged Federico Pérez Diduch requested to merge PREM-66 into master

Closes PREM-66

Merge request reports