分离 shim config
Merge branch 'separate-config'