Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse