3.3.1 fixes

There are a number of obsolete, misplaced and missing dependencies. This brings the package up to date.

Merge request reports

Loading