Resolve LOC-258

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

Merge request reports