Resolve LOC-121

Merged Uriel Mayo requested to merge LOC-121 into 15.0

Closes LOC-121

Merge request reports