update configuration
Merge branch 'dev' into users