v4.55.4

There was a mick mack on our side when cherry-picking the commit #40197 which led to a wrong commit in the patch! Sorry everyone 😭

This patch is just the official fix for #40197!