Merge pull request #1871 from alixander/disable-hierarchy-with-fixed

Merge pull request #1871 from alixander/disable-hierarchy-with-fixed #4044