Thanks @Meatballs1 for having into account! Rocking review! #2939 is already landed, hopefully it won't be needed anymore!