fixes for organism 2 hierarchies
Merge branch 'master' into stable