Draft: Resolve TOM-189 "15."

Closed Lucas Abba requested to merge 15.TOM-189 into 15.0-stage

Closes TOM-189

Merge request reports