Resolve LOC-179

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

Closes LOC-179

Merge request reports