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