Resolve LOC-188

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

Closes LOC-188

Merge request reports