Resolve LOC-259

Merged Uriel Mayo requested to merge LOC-259 into 15.0-stage

Closes LOC-259

Merge request reports