Resolve LOC-129

Merged Uriel Mayo requested to merge LOC-129 into 15.0

Closes LOC-129

Merge request reports