Update configuration guide
Merge branch 'config_update' into develop