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