Resolve LOC-76

Merged Uriel Mayo requested to merge LOC-76 into 15.0-stage

Closes LOC-76

Merge request reports