added config update
Merge branch 'test' into dev