Intent to backport OAK-8106

[Marcel Reutegger]

Hi,

I'd like to backport OAK-8106, which can result in high memory usage and affect 
the availability of the system. The fix is medium risk, but the fix in trunk 
addresses this with additional tests in this area.

Regards
 Marcel