Resolve LOC-117

Merged Uriel Mayo requested to merge LOC-117 into 15.0

Closes LOC-117

Merge request reports