Resolve LOC-127

Merged Uriel Mayo requested to merge LOC-127 into 15.0

Closes LOC-127

Merge request reports