[sr-dev] Timer handling broken in 5.5.2