Cherry pick bugfixes to 4.6

Merge request reports

Loading