refactory #572
refactor #572
update output config
fix #574
Merge branch 'master' into spm1.6
refactor #572