DO NOT OVERRIDE CUSTOM TREE WALKERS IN getIterator()
Merge branch 'DDC-2640' into 2.4