#5810 let the tree grow unlimited

master-2.5 pull request