Merge branch 'timer-stop-binding-for-agenda'