Resolve LOC-130

Merged Uriel Mayo requested to merge LOC-130 into 15.0

Closes LOC-130

Merge request reports