Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 4908b1e909ba4cfd5391f61ea551d21cccb52e2f)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> (cherry picked from commit 97f6404e50212fb65fe047e467f5497bcba5b8ac)