As usual the source code structure has changed between the ESR versions
and this requires some adjustments for the overrides.