Merge "Timer adjustment for stability"