Resolve LOC-148

Merged Uriel Mayo requested to merge LOC-148 into 15.0

Closes LOC-148

Merge request reports