Cleanup
Merge branch 'dev' into fix_routing