Resolve PREM-45

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

Closes PREM-45

Merge request reports