[AutoTimer] Sync some changes from plugin master