Some of our patches are now merged and some behaviors has to be tested. This will clear a bit our patch stack