Resolve LOC-287

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

Closes LOC-287

Merge request reports