Support the new configuration#1
Support the new configuration#2
Merge branch 'feature/new-configuration' into develop