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