Resolve LOC-257

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

Closes LOC-257

Merge request reports