Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions