Resolve LOC-279

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

Closes LOC-279

Merge request reports