Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 24c31bc0e237148b1c44811b17c61fc71f09bd93)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 785e09e3b32980380eb2081eeb48c157306f99ba)