Merge branch 'hotfix/改變顫抖'
Merge remote-tracking branch 'origin/master' into release/release2