Fixes for the 4.4.7 release

To be tested in the OME-merge-release job