ready for new config api
Merge remote-tracking branch 'origin/config-reload'