Tristan/2.33.0

merging back upstream into our fork
The goal is the have the same version we use, and then add a few fatures