Port recent bugfixes to 5.x

Merge request reports

Loading