KRACOEUS-8246: Fixing hierarchy issues.