[O1ER-10] MIgration from v12 to v15

Merged Facundo Barral requested to merge O1ER-10 into 15.0-stage

Closes O1ER-10

Merge request reports