Merge branch 'agenda-subtree-kill-with-subtree-feedback'