[#3566633]: 2.x improvements

Merge request reports

Loading