Various 3.1 fixes

Merge request reports

Loading