Resolve LOC-165

Merged Uriel Mayo requested to merge LOC-165 into 15.0

Closes LOC-165

Merge request reports