Updated config update script.
Merge branch 'test' into dev