KRACOEUS-8246: Fixing hierarchy issues.
Merge pull request #1177 from gathreya/proposalHierarchyBug-8246

KRACOEUS-8246: Fixing hierarchy issues.