Update config format to 1.2
Merge branch 'feature-upgrade-1.2' into develop
Merge branch 'develop'