[T4058] [T4056]

Merged Luciano Ortiz requested to merge 15.0-sprint5 into 12.0

Merge request reports