Resolve LOC-181

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

Closes LOC-181

Merge request reports