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