Resolve LOC-120

Merged Uriel Mayo requested to merge LOC-120 into 15.0

Closes LOC-120

Merge request reports