#3545265 porting to v4.x

Related to #3545265

Merge request reports

Loading