Resolve LOC-276

Merged Macarena Meldi requested to merge LOC-276 into 15.0-stage

Closes LOC-276

Merge request reports