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