Resolve LOC-194

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

Closes LOC-194

Merge request reports