Merge branch 'refs/heads/t/kill-w'