prevent IllegalStateException: Timer already cancelled.
Merge branch '1.3.174'