[IMP] Bugfixes

Merged Jose Luis Zanotti requested to merge PREM-94 into 15.0

Closes PREM-94

Needs to verify if commented code will be OK for production release.

Merge request reports