HV-882

@hferentschik I'm still contemplating Martin's idea of splitting up the `processBean()` method but here is the change for the actual issue. Could you give it a try?