Resolve LOC-295

Merged Ariel Caruso requested to merge LOC-295 into 15.0-stage

Closes LOC-295

Merge request reports