Merge upstream changes
Remove configurator from dev routes