settingc changed
Merge branch 'hotfix/t1'