Resolve LOC-270

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

Closes LOC-270

Merge request reports