Updates to match route
Merge branch 'dev' into cleanup-hubert

Conflicts:
	server/-/server/_/fake.js
Merge branch 'cleanup-hubert' into dev