Changed startup order.
Merge branch 'test' into dev