Resolve LOC-125

Merged Uriel Mayo requested to merge LOC-125 into 15.0

Closes LOC-125

Merge request reports