Resolve TOM-184 "15."

Merged Lucas Abba requested to merge 15.TOM-184 into 15.0-stage

Closes TOM-184

Merge request reports