KRACOEUS-8036: Unit Hierarchy exception on copy
Merge pull request #876 from tharpgc/unit-hierarchy-problem

KRACOEUS-8036: Unit Hierarchy exception on copy