merge with r69788 for fixing timer_del problem in genlist