Fixed level order.
Merge branch 'master' into demo