Resolve LOC-114

Merged Uriel Mayo requested to merge LOC-114 into 15.0

Closes LOC-114

Merge request reports