Controller returns config after register
Merge branch 'station-dev' into dev