[T2977]

Merged diego.barreto requested to merge T2977 into 12.0-stage
  1. Jan 25, 2024