Add code from 2.x branch

Related to #3022490

Merge request reports

Loading