Fixed render order.
Merge branch 'hotfix' into dev