Brian dpi 449

Merged Brian Misael López requested to merge brian_dpi_449 into 12.0-stage

Merge request reports