Resolve LOC-131

Merged Uriel Mayo requested to merge LOC-131 into 15.0

Closes LOC-131

Merge request reports