Merge "Bug 483: Fixed removals for child nodes" into stable/hydrogen