Dev config is no longer used
Merge remote-tracking branch 'origin/master'