Resolve LOC-170

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

Closes LOC-170

Merge request reports