updated config update code.
Merge branch 'test' into dev
tagged