Resolve LOC-241

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

Closes LOC-241

Merge request reports