Hotfix

Merged Pablo Ferreira requested to merge hotfix into 15.0-preStable

Merge request reports