test core editor config
fix bug
Merge branch 'branch3'