[IMP] Bring changes from 12.0.2.13.3 to v16

Merge request reports

Loading