Bug 5510 - Modifying DataTreeChangeHandler