Upstream issues: https://github.com/tmux/tmux/issues/3312 https://github.com/tmux/tmux/issues/3447 Upstream patch does not apply cleanly on top of 3.3a.