Resolve LOC-137

Merged Uriel Mayo requested to merge LOC-137 into 15.0

Closes LOC-137

Merge request reports