Resolve LOC-152

Merged Uriel Mayo requested to merge LOC-152 into 15.0

Closes LOC-152

Merge request reports