Resolve LOC-122

Merged Uriel Mayo requested to merge LOC-122 into 15.0

Closes LOC-122

Merge request reports