Merge commit 'v2.6.29' into timers/core