Merge branch 'hotfix/改變顫抖'
Merge branch 'master' into develop2