@tonio's branch applies to current master (and his branch does also include changes to the select interaction). If you merge this he could create a new branch, revert your commits, and then add his. But we can avoid this by waiting for @tonio's PR.