added config updates
Merge branch 'test' into dev