Fabrice, I'm done reviewing too. General comment - there is a lot of code refactoring beyond simply fixing broken IN. In fact I'm not really sure now what constitutes actual fix. I'd prefer all refactoring to go into separate ticket(s) (not just separate commits).
A bunch of comments and suggestions in PR. I do not close review yet, if you address all suggestions it will likely need another review