Merge branch 'hotfix/1.2.5'
Avoid empty config loading will cause array_merge error
Merge branch 'hotfix/1.2.6' into develop