Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit b9d7244035ce2da5bd93c984e30944b3730b219e)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit f632aac9385cfe02f5bfe762d93e60b5b46f2c77)