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