Fixes

Merged Uriel Mayo requested to merge Fixes into 15.0-stage

Merge request reports