Revert refactor-hierarchy merge
Merge branch 'master' into refactor-hierarchy