Fixes: U4-3427 Tree persistence not working