调整同步标示的设置
Merge branch 'master' into product